]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Drop patch that was included upstream
authorSimon McVittie <smcv@debian.org>
Wed, 15 Oct 2025 11:08:38 +0000 (12:08 +0100)
committerSimon McVittie <smcv@debian.org>
Wed, 15 Oct 2025 11:08:38 +0000 (12:08 +0100)
debian/patches/series
debian/patches/slider-Use-the-sprite-of-the-touch-event-not-the-pointer.patch [deleted file]

index a8351379f9e276833b5dea8bd9864ac934a6a1d1..d4eeab706e218fc08e0634c66e3f73886870fb46 100644 (file)
@@ -1,4 +1,3 @@
-slider-Use-the-sprite-of-the-touch-event-not-the-pointer.patch
 debian/Revert-tests-Fail-on-warnings-too.patch
 shell-app-Warn-instead-of-crashing-if-disposed-before-sta.patch
 debian/data-Add-im-config.desktop-to-System-folder.patch
diff --git a/debian/patches/slider-Use-the-sprite-of-the-touch-event-not-the-pointer.patch b/debian/patches/slider-Use-the-sprite-of-the-touch-event-not-the-pointer.patch
deleted file mode 100644 (file)
index 8a1f11d..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Daniel van Vugt <daniel.van.vugt@canonical.com>
-Date: Tue, 23 Sep 2025 14:12:56 +0800
-Subject: slider: Use the sprite of the touch event, not the pointer
-
-startDragging() starts with:
-
-  const sprite = backend.get_sprite(global.stage, event);
-  this._sprite = sprite;
-
-but then vfunc_touch_event() would only compare this._sprite to:
-
-  sprite = backend.get_pointer_sprite(global.stage);
-
-which never matched. And so _endDragging() was never called and
-the grab was never dismissed, effectively freezing the shell.
-
-Bug: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8660
-Fixes: c206ec693 ("slider: Use Clutter.Sprite for pointing focus accounting")
-Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3887
-Origin: upstream, 49.1, commit:e54aa588c1604b63e2f051e20c1ecb3e601beb5c
----
- js/ui/slider.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/slider.js b/js/ui/slider.js
-index 2cf5f14..05861b5 100644
---- a/js/ui/slider.js
-+++ b/js/ui/slider.js
-@@ -132,7 +132,7 @@ export const Slider = GObject.registerClass({
- 
-     vfunc_touch_event(event) {
-         const backend = global.stage.get_context().get_backend();
--        const sprite = backend.get_pointer_sprite(global.stage);
-+        const sprite = backend.get_sprite(global.stage, event);
- 
-         if (!this._dragging &&
-             event.type() === Clutter.EventType.TOUCH_BEGIN) {